From bd7f6ad521de3573e7e08ecb1e66e96f1de95cca Mon Sep 17 00:00:00 2001 From: Jacob Shin Date: Mon, 9 May 2011 09:49:14 +0100 Subject: [PATCH] xenoprof: Update cpu_type to sync with upstream oprofile Update xenoprof's cpu_type to match upstream oprofile. Currently AMD Family 11h ~ Family 15h are broken due to string mismatches. Signed-off-by: Jacob Shin --- xen/arch/x86/oprofile/nmi_int.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/oprofile/nmi_int.c b/xen/arch/x86/oprofile/nmi_int.c index 284d4f5b96..4f2c5adb0f 100644 --- a/xen/arch/x86/oprofile/nmi_int.c +++ b/xen/arch/x86/oprofile/nmi_int.c @@ -435,19 +435,19 @@ static int __init nmi_init(void) break; case 0x11: model = &op_athlon_spec; - cpu_type = "x86-64/family11"; + cpu_type = "x86-64/family11h"; break; case 0x12: model = &op_athlon_spec; - cpu_type = "x86-64/family12"; + cpu_type = "x86-64/family12h"; break; case 0x14: model = &op_athlon_spec; - cpu_type = "x86-64/family14"; + cpu_type = "x86-64/family14h"; break; case 0x15: model = &op_athlon_spec; - cpu_type = "x86-64/family15"; + cpu_type = "x86-64/family15h"; break; } break; -- 2.30.2